Cleanup
Refine auth response