More cleanup, commenting