Changed calls to regular expression substitution and string formatting to be compatible with python-2.6