AMQP-306 Polishing

PR Comments