Removed switch name from Switch constructor