Add PolyStyle
Code cleanup