[INC] update cosmetics fixes to comments from Linux branch