Clean thing up a bit.