can we factor this at all? Even separate files? We have Avro + Kafka going on here.