Code aligned with style guide.  Looks great in haddock!