Cleanup the code structure even further.

Now, the loop is in a function and returns the job.