JAL-2694 formatting