Completed and tested refactor of KafkaStream.