output formatting improved