fix/Minor ouput tidying up