Moved colorScale.

Also got rid of some pointless code.