remove case statement for states
states use countries methodology
use a where instead of collecting all the data