A little bit of code but mostly clean up.