Add comments and indents