ECMS-6436: Update coding format and add comment