Refactoring to crypto-shiro