Clean, make more readable, more PEP-compatible,...

latest commit 516580451b
@pidpawel authored