Use router macros

Using the router! macro is a lot less verbose.