Bring comment style in line with style guide