Roman Dubrovsky

Refactoring