Cleaned the code quite a bit
Added the sonar runner plugin to gradle