Bit of tidying, added comments