Committing refactoring