A touch of DRY'ing stuff up