some indentations adjusted