Mainly stylistic changes to meet PEP-8.