Working on the clean up.