Clean things up a little