Fixed docstrings and further cleanup