Just a little final cleanup.