(NOT READy) [#76253826] Cleanup

Think @vwxyz wanted to add some comments but forgot to or didn't, I just refactored the indention etc, I can remove them :wink::thumbsup: