- code cleanup and refactoring