Tidying up

Cleaning up the repo for clarity.