More cleanup, mostly comments