Did a bit of cleaning up