A bit of clean-up. Show some more. Skip [type:NN] as well.