cleanp/commenting/docstringing!