Namespace refactoring & Improved coding style