Let the refactoring begin!