Cleaned up server.py some.