refactored to pep8, there were some rules not yet applied like W293