cleaned up controllers and models