Cleaned up server.py