Refactoring 1 by Max
Refactoring 1 by Max