JAL-1551 format and tidy