Output formatting improved