Minor cleanup (again)