Refactor: General code refactoring#39

Anton-Dodonov merged 2 commits intodevelopmentVPNclient/VPNclient-app:developmentfrom

refactoring-branchVPNclient/VPNclient-app:refactoring-branchCopy head branch name to clipboard