RabbitMqBundle update, little refactoring