PEP8 clean-up

Code style according to pep 8