Cleaned up colormap implementation