minor code style improvements
fix for KT-5420
Buildserver auto merge