Pep8

Fixes PEP8 conformity and #18