Make style fixes

Someone else should check to see if I made a mistake.
this `== null` makes me a tiny bit nervous