Misc PEP8 fixes
Merge pull request #1289 from ahojnnes/random

STY: Misc PEP8 fixes