Issue 289: code review updates
Issue 289: updated class header
Merge pull request #426 from sanai56967/289

#426: pull request Issue 289: code review updates