More specific docstring, general cleanup