JAL-1517 formatting/tidy