Cleaned up routes
minor refactoring so far
Adjusted 'protected' methods