cleanup of job.py