restructure things to match other passport strategies