RabbitMq and refactor