Cleaning up a little bit.