Made changes to conform to Haskell conventions.