Cleaned up the output a bit