Refactoring to use routie