More project() tidying