[PLAT-3907] Minor code cleanup