Changes suggested by HLint