PEP8
python 2.5 compat
python 2.5 compat
python 2.4 support fixes