UPDATED: Minor code cleanup in setup.py