jacket-23
Refactoring