Include minor clean up.