Additional cleanup/comments