A little straightening up, nice and tidy