Changed some output formatting