Pep8ify code as much as I'd like Fixes #8