SOS-1138 Source formatting