Committing before refactor