LPS-31637 Source formatting