Changing Envelope to PushNotification, adding a constructor for PushNotification, and general cleanup.