Fix and simplify code.