Minor comment and docstring edits, remove extra import