Cleaned up the job and breakdown