Commenting and indenting completed