comments added and indentations set