[refactor] more simplifying things for my dumb self