Code cleanup in the crypto class