cleaned up some hotspots