Indentation fixes for formatting of code; other changes.