PLA-1158 Code elegance