1** crypt refactoring