Minor cleanup/optimization