cleaned up routes & refactored controller logic