Here is the refactoring we did today