refactored and cleaned up controllers