Project tidy-up