commit before refactoring main