refactor: extract handler selection logic into its own function

refactor: extract handler selection logic into its own function #17