MQ: Cleanup to use var

here