Make new files conform to indentation standard
Make the large new function conform to indent style
Fix indent/missing brace issue.