Changed coding style to be compliant with PEP8
Fixing some code, minor revision