Cleaned up the parser.