Abit of tidying up