Committing before refactoring everything