Moved a couple of comments