cleanup doc-strings
cleanup comments