committing before refactor