refactor to prepare for new tcga data