Improve whoisout output