Cleanup
Fix indentation
Polygon should be 6 points, not 7