Clean up job code
Updates to saving code