setup.py update + code style changes
revert help string reformatting