minor refactor: move some helper methods to a more logical spot
9 files changed