Remove unneeded logic from request class
Refactor router class