Fixes some remaining indentation and format issues.