LPS-33079 Consistent source formatting