Try style consolidation again