Comment, docstring and internal naming updates