Reducing OCLint warnings