Minor cleanup...