Update to comments and rename of main view controller class