SOS-1369 source formatting