fixing indentations & long lines