Legibility effort

inserted spaces in various places to try an improve code readability, line count be damned.