Added comments to the Trait and Class