More cleanup of .status output