Tidied up the files