Reducing OCLint and Simian warnings