Commit before branching and refactoring