PLA-399 code formatting changes, according to code standards