Merge pull request #4 from hazendaz/master

Sonar Cleanup.