cleanup
Merge pull request #2 from oczkers/cleanup

Little cleanup (pep8 etc.)