Encryption: it works! Code cleanup is still required