Cleaned methods for Shape classes