Clean up accessors.  further small tidying up