Lot of style changes. Now it is more PEP8 friendly