Working on cleaning up stuff again.