Formatting and more static code analysis.