fixed comments and indentation