Modified some of the comment and indentations.