PEP-8, Python Zen, refactor and reduce code

Not finished but this code is stable.