Tidied up some files