final(?) shading cleanup