PEP8 and Python 2.6 compatibility