Minor cleanup/fix