Moved handlers into their own routing methods. Changed one line in handlers.