cleaned up routes more