HHH-7943 formatting and cleanup