Fixed and tidied up repo