cleanup in Router class
code style cleanup