fixed indentations and others