de-plaintext: small structural changes