Minor cleanup

Minor code cleanup in Worldviewer