general cleanup

- whitespace harmonization (use two spaces everywhere)
- add spaces after `,` and around `+`
- balance some instances of spacing inside brackets
- fix indentation levels in some places
- break some long lines