commit before refactoring view generation