Pass token parameter explicitly. Tidying things up.