Refactor output to show more details