Tidying up repo (part 1)