refactor to simplify
refactoring with super Dry