more color variable cleanup