TIMOB-6053-Formatting changes as per review comment