JAL-3033 formatting