JAL-3985 formatting