some refactoring
Merge branch 'master' of github.com:dyagilev0/graph