LPS-9603 Source Formatting