Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Holger Stitz <2cf5a210a3ef9d686661010908424a9b3beca956@datavisyn.io>
datavisyn/tdp_core,datavisyn/tdp_core,datavisyn/tdp_core,datavisyn/tdp_core