try to made it more dry
a little more DRY