a bit of clean-up on viewer.draw()