PLA-765 fix whitespace and add comments