Pep8ization in progress

A try to clean-up your mess ;)