Changes For CellColor and general cleanup