LPS-44052 A cleaner solution
LPS-44052 Source formatting