Cleaned up response handling a bit