Fix more indentation and format issues.