More cleanup, reformated a few more.