Style fixes for new router and request classes