JobsAction code cleanup