refactor: yet another refactor (YAR)