Little bit of tidying up