general tidying of project