Update to comply with PEP-8 a little better and make it 2.x compatible.