some small tidying