Cleaning up Router class