Fixed Analye and OCLint warnings