PEP8 and renaming of module.
Commited missing modifications...
Bug fixes.