nicer code DRY
style