- code refactoring and cleanup