refactor(*): simplify based on bcwaldon's feedback