Fix compiler warnings & refactor code after security review