Make style fixes

Someone else should check to see if I made a mistake.
The `!needle` and `!haystack` checks at the beginning of the function should be foolproof.