Basic clean-up.
Updated docstrings.