MOD-491 : Comments in functions