SOS-1571 Source formatting