Fixed some output formatting