Attempting to make the output a bit more useful