Code Refactoring and cleanup