Code style cleanup
Fix some auth stuff