JAL-1583 formatting