PERFORMANCE: fewer ribbon updates, comment cleanup