Clean up consume/consumer
Clean up consume method