Make `name` a required value
Clean up