EDA-44: Added a new optional parameter to the kafka message stream, + some code style amends.