Update with my guess at refactoring