Formatting refactoring

[jahudzik]

Some refactorings:

• Unified formatting of the brackets in the statemets
• Removed redundant imports and empty lines
• Fixed some typos

[mention-bot]

@jahudzik, thanks for your PR! By analyzing the history of the files in this pull request, we identified @sibelius, @RoyMontoya and @whoshuu to be potential reviewers.