fixup! fixup! fixup! Refactor HTTP server code