SI-7484 Indentation and whitespace fixes