edit some indentations and comments