Refactor of code

[Mykhol]

As a developer, I would like to have reusability of code. We should try to refactor:

Subtasks:

• [x] #16
• [x] #18
• [x] #19