JAL-1604 formatting