More cleanup/comments