Yet another PEP8 attempt, now semi-manual. macroeor works (hopefully) and has no TABs