Some cleanup, working on creating a dictionary of jobs for
faster access + quicker get_job() implementation