[PDI-13072]: code style fixes