JAL-1923 formatting