Did a bit of a tidy up