Improve output of `status` command