[REFACTOR] global code refactoring

Signed-off-by: Anastasia Lyupa <anastasiya.lyupa@gmail.com>