got rid of all method_key references
got rid of opt_keys and opt_vals
whitespace cleanup