moved comments to model