Version updated.
Haskell code cleanup.