[S4-110] Formatting code to make the diff look better