changed indent style
deprecated accepting hashes for where clauses and datasets