Cleaned up the output a bit of discovery