Normalize whitespace (oops)
Normalize option handling