Performance enhancing styles
Merge pull request #1 from mattercomm/performance-enhancements

Performance enhancing styles