Cleanups: docstrings, method decoration, pep8