tasellielund kkuhn fix red-flag codepro violations and a few class
comments