bit of tidying and comments