Refactoring parser