commiting to refactoring