Cleaning and refactoring for parsers.