cleaned up parser.