cleaned up
a bit of tidying up