fixup! Minor cleanup