diff --git a/src/Data/Validity/HashMap.hs b/src/Data/Validity/HashMap.hs
--- a/src/Data/Validity/HashMap.hs
+++ b/src/Data/Validity/HashMap.hs
@@ -4,14 +4,13 @@
 
 import Data.Validity
 
-import Data.Hashable (Hashable)
 import Data.HashMap.Strict (HashMap)
 import qualified Data.HashMap.Strict as HM
+import Data.Hashable (Hashable)
 
 -- | A 'HashMap' of things is valid if all the keys and values are valid.
 --
 -- The 'unordered-containers' package does not export any more functionality
 -- concerning a 'HashMap', so no more accurate validity instance can be made.
 instance (Hashable k, Validity k, Validity v) => Validity (HashMap k v) where
-    isValid m = all isValid (HM.toList m)
-    validate m = HM.toList m <?!> "HashMap elements"
+    validate = delve "HashMap elements" . HM.toList
diff --git a/src/Data/Validity/HashSet.hs b/src/Data/Validity/HashSet.hs
--- a/src/Data/Validity/HashSet.hs
+++ b/src/Data/Validity/HashSet.hs
@@ -12,5 +12,4 @@
 -- | A 'HashSet' of things is valid if all the elements are valid and
 -- the underlying 'HashMap' is valid.
 instance (Hashable v, Validity v) => Validity (HashSet v) where
-    isValid hs = isValid $ HS.toMap hs
-    validate hs = HS.toMap hs <?!> "HashSet elements"
+    validate = delve "HashSet elements" . HS.toMap
diff --git a/src/Data/Validity/UnorderedContainers.hs b/src/Data/Validity/UnorderedContainers.hs
--- a/src/Data/Validity/UnorderedContainers.hs
+++ b/src/Data/Validity/UnorderedContainers.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-dodgy-exports #-}
+
 module Data.Validity.UnorderedContainers
     ( module UnorderedContainers
     ) where
diff --git a/validity-unordered-containers.cabal b/validity-unordered-containers.cabal
--- a/validity-unordered-containers.cabal
+++ b/validity-unordered-containers.cabal
@@ -1,32 +1,40 @@
-name: validity-unordered-containers
-version: 0.1.0.0
-cabal-version: >=1.10
-build-type: Simple
-license: MIT
-license-file: LICENSE
-copyright: Copyright: (c) 2017 Tom Sydney Kerckhove
-maintainer: syd.kerckhove@gmail.com
-homepage: https://github.com/NorfairKing/validity#readme
-synopsis: Validity instances for unordered-containers
-description:
-    Please see README.md
-category: Validity
-author: Tom Sydney Kerckhove
+-- This file has been generated from package.yaml by hpack version 0.20.0.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 11b414952d556c2f92ffa9dbe23d402233d17a579929232079bf2448c271c63a
 
+name:           validity-unordered-containers
+version:        0.2.0.0
+synopsis:       Validity instances for unordered-containers
+description:    Please see README.md
+category:       Validity
+homepage:       https://github.com/NorfairKing/validity#readme
+bug-reports:    https://github.com/NorfairKing/validity/issues
+author:         Tom Sydney Kerckhove
+maintainer:     syd.kerckhove@gmail.com
+copyright:      Copyright: (c) 2017-2018 Tom Sydney Kerckhove
+license:        MIT
+license-file:   LICENSE
+build-type:     Simple
+cabal-version:  >= 1.10
+
 source-repository head
-    type: git
-    location: https://github.com/NorfairKing/validity
+  type: git
+  location: https://github.com/NorfairKing/validity
 
 library
-    exposed-modules:
-        Data.Validity.UnorderedContainers
-        Data.Validity.HashMap
-        Data.Validity.HashSet
-    build-depends:
-        base >=4.7 && <5,
-        validity >=0.4 && <0.5,
-        unordered-containers >=0.2.7,
-        hashable -any
-    default-language: Haskell2010
-    hs-source-dirs: src
-
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+    , hashable
+    , unordered-containers >=0.2.7
+    , validity >=0.5 && <0.6
+  exposed-modules:
+      Data.Validity.UnorderedContainers
+      Data.Validity.HashMap
+      Data.Validity.HashSet
+  other-modules:
+      Paths_validity_unordered_containers
+  default-language: Haskell2010