PLA-897/PLA-897-new/PLA-949  Moved number to const and fixed code elegance