Update doc-strings and replace use of None