JAL-3141 Tidying