Change adamantium dependency to only depend on the minor version
Refactor method that outdents code to be simpler