Refactoring!
Refactoring!!!