Small cleanup for jobs

This still has a bug