Apply more code-styling fixes