Changes to comments and indentation