Clean up
Rework auth process