consume token[s] smart: cleanup & minor impro