Commit changes before I refactor