CSP1150 A1: cleaned up comments and names