Comments update and router refactoring