A massive tidyup