Refactored and cleaned up RabbitMQ classes