JAL-2154 formatting