Solving 30
Refactoring