Refactoring
Refactoring2