oauth working, need some clean up