A bit of tidying up and useful accessors.