JAL-1759 formatting