Using fromMaybe.
cosmetic changes.
fixing #118.