cleaned up server.py