Minor stylistic changes suggested by HLint