Update to better format out output.