- Cosmetic change
- Simplify code