Some small tidying