OAuth & more code style fixes