JAL-2418 formatting