NOUVEAU - task 135: [QUALITY] Correct Sonar issues 
http://issues.osgiliath.net/issues/show/135

refs 135
refs 135: quality and documentation
Merge pull request #4 from OsgiliathEnterprise/135

135