LPS-32335 Source formatting and change "required" logic