#15: Whitespace cleaned, proper types.
#15: Use base class instead of polygon.