Some minor improvement to our Viewer plugin (#222).
Some minor cleaning up.