move some shared logic to functions
2 files changed