refactor: move a couple of methods around