JAL-4134 formatting