Refactored polygon a bit more