pep8 & various fixes
refactoring
Merge pull request #7 from oczkers/develop

refactoring