Remove duplicated code

[matjazv]

Description

• currently we have some identical code blocks on a different places in the code
• duplicated code tends to be more error prone
• possible solution is to replace duplicated code with a function call

Acceptance Criteria

• there is no duplicated code in a project

Additional Information

• only perform this action on a places in the code where and if it makes sense