typo fixes, indentation and formatting changes