files tidied up