SOS-1454
Source formatting - use quotes as delimeter when possible