Refactor
Cosmetic