Refactor, http server