Tidied up repository