Move more variable selector interactions into helper class