Formatting

Here is a summary of the changes:
* Using eclipse auto-format tool I made the style very consistent thought the code
* I cleaned the imports according to http://legacy.python.org/dev/peps/pep-0008/#imports