Indenting and misc commenting