Formatting and docstring changes