Cleaned up heatmap