Applied changes suggested by HLint