small tidying up changes