Cleaned up routes and server