Fixed few Sonar Issues - Added on behalf of Sharad