code cleanup

cleanup setup.py and other files