OC-2633: Fixes for comments in code. PR #347