Envelope style refactor