Refactoring 1 by Max