Fixing issues from code climate
Fixing view class per CC