Corrected Sonar violations
Improved documentation