Misc. syntax and formatting changes based on static code analysis