minor fix with output organization