Commit before small refactor