LPS-52016 - Source formatting