DEV-71 | Apply comments for the doc
DEV-71 | Use the syntax note for Note