Tidied up FileParser