Clean up a few nits.