Minor cleanup again