[Job|System] some more line shortening