Merge #49: Refactoring server.py