cleanup
refactored auth