cleaned up tumorview code