ECMS-6474: Add comments and fix indent