Minor reformatting, documentation, import, and setup.py fixes from PEP8 and pycharm analysis

This is just a minor cleanup performed using pycharm.