Tidied up the Files