Cleanup and comment

Eliminated unnecessary stuff from view controllers and added a few comments.