added support for openssl encryption/code cleaning