cleaning up Types.hs