Cleaned up controllers