JAL-1954 formatting