Change type
Minor cleanup