Modified source files to conform to PEP8.
Fix bug.