Cleanup
Add better authentication