Fix various whitespace and code guideline formatting issues
Fix various whitespace and code guideline formatting issues x2. Commit files I missed in previous commits