Non-functional, code cosmetic changes.
cleaning up codebase to remove unnecessary code, and strengthen object security.