Still trying to tidy up the repository