CONN-821:Address PR comments and formated classes