Cleanup. Add XHR and Headers classes