CAAERS-6938 formatting changes