Refactoring

It's my refactoring