Code cleanup
Refactoring and cleanup
Refactoring and cleanup
Refactoring and cleanup