Calum/cls sort and data cleanup