some refactoring
cleaned up controllers and routes