Better docs, function names