base optimization
Merge pull request #1 from Kazberovich/refactoring/base_optimization

Merge pull request #1 from Kazberovich/refactoring/base_optimization