Clean up login function
Fix setup.py