Change: remove unnecessary function arguments
Change: move router to more appropriate location