FIX Use Py2.6-compatible string formatting

Also PEP8