Fix display name setting
Minor cleanup