Little bit of tidying