Taking a look at tidy up of encrypt