Refactoring
Refactoring....