PEP8'd a little bit more
fixes #5