Renamed router, some additional clean up