PLA-1487 code formatting