Isolate cosmetic changes

[wnagrodzki]

Changes that change the source code layout should be done in separate commits

• changing indentations
• adding or removing new lines
• moving code within file scope