Updated formatting and docstrings to be more consistent.