some slight cleanup to three-viewer