CSP1150 A1: removed duplicate semicolon, fixed comments
CSP1150 A1: fixed comments
CSP1150 A1: fixed comments
CSP1150 A1: removed unnecessary this, fixed comments and javadocs