style fixes, cherry-pick this and fixup with ae87790