More formatting modifications

- Man those linter lines really make me go crazy
4 jobs for 43-unittests in 1 minute and 12 seconds (queued for 2 seconds)