Piotr Fixes and pep8