consolidation and style changes