Tidying up project