combine aes encryption and decryption
code cleanup