PLA-1354 code reformat