Fix and simplify model