making code more generalizable/cleaner

General
2

Questions with a full reprex. See the FAQ are more likely to attract answers than those without.