Minor cleanup/