Many cosmetic and docstring changes.