Awesome refactor of router