minor refactoring, removes unnecessary Heatmap model