Tidied up repo