Encrypt now support uppercase
Unencrypt now support uppercase
Clean code