Make style fixes

Someone else should check to see if I made a mistake.
I think it's better to check explicitly for undefined.