LPS-37842 General source formatting