Make correction to comments and clean up indentation