Removed useless controller class

Also added/changed some more comments