PLA-1806 code formatting