chore(*): #784 - remove complexity from handler constructors