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

refs 135
Merge pull request #3 from OsgiliathEnterprise/135

NOUVEAU - task 135: [QUALITY] Correct Sonar issues