PEP8 recommendations. Fixes #5