jacket-8
Refactoring