Roman Kofman

Refactoring