Act upon some static code analyzers suggestios