More cleanup, adding mostly comments