Update feature: Minor cleanup