diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
deleted file mode 100644
index 0243c70..0000000
--- a/.github/workflows/CompatHelper.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: CompatHelper
-
-on:
-  schedule:
-    - cron: '00 * * * *'
-  issues:
-    types: [opened, reopened]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        julia-version: [1.2.0]
-        julia-arch: [x86]
-        os: [ubuntu-latest]
-    steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.julia-version }}
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: julia -e 'using CompatHelper; CompatHelper.main()'
diff --git a/Manifest.toml b/Manifest.toml
index 350838e..6edc777 100644
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -28,10 +28,10 @@ uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 version = "0.5.8"
 
 [[Calculus]]
-deps = ["LinearAlgebra"]
-git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad"
+deps = ["Compat"]
+git-tree-sha1 = "bd8bbd105ba583a42385bd6dc4a20dad8ab3dc11"
 uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
-version = "0.5.1"
+version = "0.5.0"
 
 [[CommonSubexpressions]]
 deps = ["Test"]
@@ -46,9 +46,9 @@ uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
 version = "2.2.0"
 
 [[ConstructionBase]]
-git-tree-sha1 = "a2a6a5fea4d6f730ec4c18a76d27ec10e8ec1c50"
+git-tree-sha1 = "e3efe0a0f49dcd294c8c73e897b4fdf891f0fbd3"
 uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
-version = "1.0.0"
+version = "0.1.0"
 
 [[DataAPI]]
 git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252"
@@ -57,9 +57,9 @@ version = "1.1.0"
 
 [[DataStructures]]
 deps = ["InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "a1b652fb77ae8ca7ea328fa7ba5aa151036e5c10"
+git-tree-sha1 = "1fe8fad5fc84686dcbc674aa255bc867a64f8132"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.17.6"
+version = "0.17.5"
 
 [[Dates]]
 deps = ["Printf"]
@@ -71,9 +71,9 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[DiffEqDiffTools]]
 deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"]
-git-tree-sha1 = "81edfb3a8b55154772bb6080b5db40868e1778ed"
+git-tree-sha1 = "21b855cb29ec4594f9651e0e9bdc0cdcfdcd52c1"
 uuid = "01453d9d-ee7c-5054-8395-0335cb756afa"
-version = "1.4.0"
+version = "1.3.0"
 
 [[DiffResults]]
 deps = ["Compat", "StaticArrays"]
@@ -93,9 +93,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[Distributions]]
 deps = ["LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
-git-tree-sha1 = "51d184211a807ddba5f48d06098e93986759ec43"
+git-tree-sha1 = "838a37797ac24c1b4c3353d46ec87ea6598f2308"
 uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
-version = "0.21.9"
+version = "0.21.7"
 
 [[ForwardDiff]]
 deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
@@ -126,11 +126,10 @@ git-tree-sha1 = "186c2afbdb3cd52191078cfc6176f7084ed9dfb7"
 uuid = "2fda8390-95c7-5789-9bda-21331edee243"
 version = "0.8.1"
 
-[[MacroTools]]
-deps = ["Compat", "DataStructures", "Test"]
-git-tree-sha1 = "82921f0e3bde6aebb8e524efc20f4042373c0c06"
-uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-version = "0.5.2"
+[[MLStyle]]
+git-tree-sha1 = "67f9a88611bc79f992aa705d9bbc833a2547dec7"
+uuid = "d8e11817-5142-5d16-987a-aa16d5891078"
+version = "0.3.1"
 
 [[Markdown]]
 deps = ["Base64"]
@@ -152,9 +151,10 @@ uuid = "d41bc354-129a-5804-8e4c-c37616107c6c"
 version = "7.5.0"
 
 [[NaNMath]]
-git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
+deps = ["Compat"]
+git-tree-sha1 = "ce3b85e484a5d4c71dd5316215069311135fa9f2"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "0.3.3"
+version = "0.3.2"
 
 [[OptimBase]]
 deps = ["Compat", "NLSolversBase", "Printf", "Reexport", "Test"]
@@ -213,12 +213,6 @@ git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0"
 uuid = "189a3867-3050-52da-a836-e630ba90ab69"
 version = "0.2.0"
 
-[[Rematch]]
-deps = ["Compat", "MacroTools"]
-git-tree-sha1 = "cb5298565d0642a4de0bd3feed284a1af326cb8e"
-uuid = "bfecab0d-fd4d-5014-a23f-56c5fae6447a"
-version = "0.3.2"
-
 [[Requires]]
 deps = ["Test"]
 git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1"
@@ -310,9 +304,9 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [[Unitful]]
-deps = ["ConstructionBase", "LinearAlgebra", "Random"]
-git-tree-sha1 = "c1ba76e3ca74a838e221e69b0ff8429226c5826a"
+deps = ["LinearAlgebra", "Random"]
+git-tree-sha1 = "161092cff2e4ec6f22a458170dcb3ae4efad8352"
 repo-rev = "master"
 repo-url = "https://github.com/PainterQubits/Unitful.jl"
 uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
-version = "0.18.0"
+version = "0.17.0"
diff --git a/Project.toml b/Project.toml
index 458340c..6af4428 100644
--- a/Project.toml
+++ b/Project.toml
@@ -8,18 +8,12 @@ ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LsqFit = "2fda8390-95c7-5789-9bda-21331edee243"
+MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
-Rematch = "bfecab0d-fd4d-5014-a23f-56c5fae6447a"
 Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
-ConstructionBase = "1.0"
-LsqFit = "0.8"
-Polynomials = "0.5.2"
-Rematch = "0.3"
-Roots = "0.8"
-Unitful = "0.18"
 julia = "1"
 
 [extras]
diff --git a/README.md b/README.md
index 2434a94..bafaa8f 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,10 @@ See [documentation](https://mineralscloud.github.io/EquationsOfState.jl/dev/).
 
 ## Compatibility
 
-- [Julia version: `v1.0.0` and above](https://julialang.org/downloads/)
+- Julia version: `v1.0.0` and above
 - Dependencies: see
   [`Project.toml`](https://github.com/MineralsCloud/EquationsOfState.jl/blob/master/Project.toml)
-- OS: macOS, Linux, and Windows
+- OS versions: macOS, Linux, and Windows
 
 ## TODOs
 
diff --git a/docs/Manifest.toml b/docs/Manifest.toml
index c5a011b..d2e5c97 100644
--- a/docs/Manifest.toml
+++ b/docs/Manifest.toml
@@ -19,11 +19,11 @@ version = "0.8.1"
 
 [[Documenter]]
 deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
-git-tree-sha1 = "b73782eb6bd43c3faff3c81e9c3519cd66457788"
+git-tree-sha1 = "e35e433fe501fe13e674f38ad13a208ad6b71a6e"
 repo-rev = "master"
 repo-url = "https://github.com/JuliaDocs/Documenter.jl.git"
 uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-version = "0.24.2"
+version = "0.24.0-DEV"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
@@ -50,9 +50,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[Parsers]]
 deps = ["Dates", "Test"]
-git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556"
+git-tree-sha1 = "c56ecb484f286639f161e712b8311f5ab77e8d32"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "0.3.10"
+version = "0.3.8"
 
 [[Pkg]]
 deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
diff --git a/src/EquationsOfState.jl b/src/EquationsOfState.jl
index eb9f8e8..4f8a386 100644
--- a/src/EquationsOfState.jl
+++ b/src/EquationsOfState.jl
@@ -1,12 +1,6 @@
 module EquationsOfState
 
-export EquationForm, EnergyForm, PressureForm, BulkModulusForm
-
-abstract type EquationForm end
-struct EnergyForm <: EquationForm end
-struct PressureForm <: EquationForm end
-struct BulkModulusForm <: EquationForm end
-
+include("prelude.jl")
 include("Collections.jl")
 include("NonlinearFitting.jl")
 include("FiniteStrains.jl")
diff --git a/src/LinearFitting.jl b/src/LinearFitting.jl
index b977308..3e3cc91 100644
--- a/src/LinearFitting.jl
+++ b/src/LinearFitting.jl
@@ -5,7 +5,7 @@ module LinearFitting
 
 using LinearAlgebra: dot
 using Polynomials: polyder, polyfit, degree, coeffs, Poly
-using Rematch: @match
+using MLStyle: @match
 
 using ..FiniteStrains
 
diff --git a/src/prelude.jl b/src/prelude.jl
new file mode 100644
index 0000000..de4bba9
--- /dev/null
+++ b/src/prelude.jl
@@ -0,0 +1,6 @@
+export EquationForm, EnergyForm, PressureForm, BulkModulusForm
+
+abstract type EquationForm end
+struct EnergyForm <: EquationForm end
+struct PressureForm <: EquationForm end
+struct BulkModulusForm <: EquationForm end