code cleanup, more heatmaps