Extracted some methods to baseShape. Removed square.