Apply changes suggested by smm for DM-199
Fix inline comment style for doxygen