(no-ticket) PEP8 fixes
Merge pull request #9 from filipochnik/refactoring

(no-ticket) PEP8 fixes