LPS-47148 - General source formatting