refactor: small tweaks for consistency

[meszaros-lajos-gyorgy]

• [x] Add missing curly brackets for ifs and loops
• [x] Unnest nested ifs
• [ ] Add missing indentation
• [ ] Split single if-return lines into if blocks

[meszaros-lajos-gyorgy]

Wrong base, meant to target ArxLibertatis...