Refactoring!
Refactoring!