Cleanup code to make more consistent and pep-8 compliant

Quote from pep-8: "One of Guido's key insights is that code is read much more often than it is written." Making the code more readable means faster development and with this blueprint I propose a cleanup of the code, not only esthetically speaking but also with constructs that python offers to make code more robust (with statement, etc.).