General project tidyup