Fixing random bugs and structural issues with Sonar