refactoring, commit for router