jacket-44
Refactoring