Some tidying of project() and subfunctions