added tags and cleaned up consumer output