Fixing multiple jobs and cleaning code