cleaned up controllers, removed .all queries to increase efficiency