Finished cleaning up server.py