Indentation and formatting fixes

1 job for !8 with FTS-1777
latest merge request