DJ, Charles & Greg: refactoring of the python service.