LPS-46318 SF - make the code easier to maintain