Whitespace fixes.
Re-writing to use more Applicative.