Fixed comment, polish