Minor improvements; Fix for the haskell-style data declaration