More doc-string and style improvements