Did a bit of tidying up.