removed args from dispatch(), minor refactor