refactoring and commits