Fixed sonar issues.
Modified user doc