Fix indents in the files and got rid of extraneous comments