cleaned up output more