Implement Route class functionality
Small refactoring