A bit of cleanup in serve.py