make output more concise; slightly refactor output