Changing this to a parameterized class, removing references to name variable