Changed some comments, indents