CSP1150 A1: cleaned up the view's variables