Tidied up file