Slight CryptoUtil refactoring