[TIMOB-15731] style and syntax updates