A bit of cleanup and doc-string fixes