Sergy Sergyenko

Refactoring