Clean things up a little bit more.