SOS-2087 Source formatting