Refactoring to simple router syntax.