Clean up controllers
Add annotations to models