minor cleanup on token looking for number