factored out model for dict ac
small cleanup