New definitions
Refactoring
Solving 24