Applied Klaus Niederkrueger's latest flat-shading clean-ups and some of my own.