major cleanup
ViewpointView