Refactoring parse