JAL-2945 formatting