Correct Sonar Critical Violations (#80)
Dodgy - Double assignment of local variable