refactoring
Merge pull request #45 from kashesandr/legend/refactoring

refactoring