Tweaking color map
Cleanup and tweaking