Cleanup, added 2 comments.