Fix indenting and add some comments