Fix [SonarQube] Switch cases should end with an unconditional break
statement
Fix [SonarQube] Avoid commented-out lines of code