JAL-4114 formatting