Refactor comments in if-else blocks

[jj1980a]

Moving comments in the block scope they are intended to be.

From:

// comment for if
if (condition1) {
    ...

    // comment for following else if
} else if (condition2) {
    ...

    // comment for following else
} else {
    ...
}

To:

if (condition1) {
    // comment for current if
    ...
} else if (condition2) {
    // comment for current else if
    ...
} else {
    // comment for current else
    ...
}

[BenSparksCode]

LGTM