setup.py update + code style changes

please review