Use correct variable
Remove valid_scale and valid_scale_types
Use S3 dispatch for creating prop objects