Fixed comment and indention