Refactor some parts of Parse