Encryption service refucktored