I smidge of style cleanups