LPS-46916 - General source formatting