clean up, better encapsulation of Job

Change-Id: Ifd0f7fde8d2e108fb3c7f18d504f703765da7f8f