Modified for PEP8 module names.
More refactoring.