commit after refactoring and code cleanup