Fix [SonarQube] Avoid commented-out lines of code (A block of
commented-out lines of code should be removed)
Format per coding standard
Refactor local variable name for descriptiveness