Fixes for master

I decided to start lending a hand here in the master branch and here are some fixes that are easy to see and that make the code easier to read, at least for those used to the usual Python standards.

Please, review them.