simplify options normalization helper
refactor router