Cleaned up controllers and commented