different colors, mostly
removed commented variable