Misc style cleanup to match PEP8.  Left the public interface and class name alone for now even though they don't conform to PEP8