Refactor & reduce duplication across route DSL