This has some clean up changes.