Refactor to run on the US smoking data