Fiddled a bunch of comments
Fix indents