Trim out many inline styles
Add missing comment controller
Compatibility with new cleanups
Merge branch 'cleanup'