Code cleanup Router.php