Formatting changes and tab2spaces for iss86 branch, before merging.