Simplify and tweak output based on feedback from @unscriptable