Refactoring parsing process, only one method, move logic into entity