Add cleanup support for HTTP broadcast + style fixes