Refactor code to simplify

* Route handlers receive an optional RouteContext instead of Context