Cleaned up parser.