PLA-341 code cleaning