Tweaking indents
Fix indenting and add comments