@rybakit could you please create a new issue to discuss this as the PR has been closed - you suggestion is applicable at several places in the code. Tanks.