CSP1150 A1: fixed javadocs and comments