SONAR - Fixes, replace tabs with spaces