Minor code and setup.py cleanup