Improved encryption using built-in PKCS#5
Cosmetic changes