simplify auth mechanism a bit more