Massive tidying up. I'm impressed