Filter in job list to get rid of old stuff
Tidying up the code
More cosmetic changes in the source code