Typography cleanup and consolidation