Clean up of Crypt class

I went to fix a typo, ended up reading it and decided to remove the duplications, and make some readability changes.