Refactoring of parsing rules