Tidying up the repo (part 2)