MQ: Cleanup to use var