Cleanup and DRY the Router