Refactor and changes to response handling
Remove some comments