Cleaned up output a little