Clean things up just a touch