Make style fixes

Someone else should check to see if I made a mistake.
this is *probably* safe but deserves a quick double-check with some weird edge cases