refactor: remove Request Handler from Response Handler