Reduce, simplify and fixes.