JAL-674 formatting