cleanup Encrypt and Decrypt to use aesEncrypt and aesDecrypt