Fixed Some Sonar Findings