Minor cleanup cleanup