Fixing style is tricky, cuz if you do it in one place you should really be doing it everywhere.  I would say leave out style fixes for now, and we can do a followup bug/issue for that. (in general)