Minor cleanup work