[PLAT-6879] code tidy-up