Refactor Wait For Response