CAS-1410: Addressed feedback. Updated formatting.