PLA-821 code formatting