Use builder pattern for sign and encrypt
cleanup
fixes encryption