cleaned up more critical points (sonar)
corrected Method names mentioned by Sonar
more sonar identified stuff cleaned