Better docs, more accurate var names