reworked output formatting