FileParser + Refactor