Refactoring FileParser