Color and variable consolidation and cleanup