Moved color arg in Circle and Square constructor