Cleaning things up some more.