remove duplication in ResourceDSL#*_action methods
simplify options normalization helper
refactor router
Merge pull request #1831 from goshakkk/refactor

Some refactoring