Refactoring
Refactoring...