refactoring to lists
Merge pull request #5 from dmakhno/unified_refactoring

Refactoring to lists