Checklist

• I reviewed the Contributing Guide.
• I performed a cursory search to see if the bug report is relevant, not redundant, nor in conflict with other tickets.

Describe the bug
Some of the items listed in #933 could be cleared up without any changes to the code (i.e. easy wins):

• split up multiple declarations on a single line
• remove redundant definitions (i.e. values that are not used before the variable is assigned a new value)
• remove side-effects from statements where no refactoring or new variables are needed
• add braces to single line if/else blocks

Expected behavior
Comply with rules common to the relevant coding standards/guidelines where it makes sense, improves clarity, improves consistency and eases future maintenance.

Reporter Info
Avi Weiss @thnkslprpt